switchroot: Move late /run/ostree-booted creation to ostree-system-ge… #1675
Conversation
Definitely; see https://bugzilla.redhat.com/show_bug.cgi?id=1331369 While we could have more clearly split out the ostree-as-host portions in the Fedora packaging, people can easily get those bits installed as a dependency of flatpak, etc. I think the Debian packager was more careful about this, but it still pays to be defensive. |
src/switchroot/ostree-remount.c
Outdated
| * a file versus parsing the kernel cmdline. So let's ensure | ||
| * the stamp file is created here too. | ||
| */ | ||
| touch_run_ostree (); |
There was a problem hiding this comment.
I've been trying at least a little bit to support the non-systemd case. After this change in the "switchroot-as-pid1, !systemd" case nothing will be creating /run/ostree-booted right? It should be harmless to leave this call in to ensure we create the file the same as we did previously.
Maybe just:
/* When systemd is in use this is normally created via the generator, but
* we ensure it's created here as well for redundancy.
*/
touch_run_ostree ();
?
There was a problem hiding this comment.
I think that makes sense... when I deleted it from there I debated whether creating /run/ostree-booted in many places was a sensible approach to cover corner cases. I'm certainly guilty of not thinking about !systemd...
akiernan
force-pushed
the
us-ostree-booted
branch
from
587bb67 to
ea27e5a
Compare
…nerator When ostree-prepare-root is pid 1, ostree-prepare-boot defers creation of /run/ostree-booted, which happens in ostree-remount, but that's too late if we need ostree-system-generator to bind /var. Add the creation of the /run/ostree-booted marker to ostree-system-generator based on the existence of the ostree= kernel command line argument (which matches the condition that ostree-remount uses). Signed-off-by: Alex Kiernan <[email protected]>
akiernan
force-pushed
the
us-ostree-booted
branch
from
ea27e5a to
ae36f71
Compare
|
Looks great, thank you! |
|
⚡ Test exempted: pull fully rebased and already tested. |
…nerator
When ostree-prepare-root is pid 1, ostree-prepare-boot defers creation of
/run/ostree-booted, which we were doing in ostree-remount, but that's too
late if we need ostree-system-generator to bind /var. Move the creation
of the /run/ostree-booted marker to ostree-system-generator based on the
existence of the ostree= kernel command line argument (which matches the
condition that ostree-remount used).
Signed-off-by: Alex Kiernan [email protected]